Refactor 2022 #4