Refactor 2022 #7