Refactor 2022 #3