Refactor 2022 #1