Refactor 2022 #10