Refactor 2022 #2