Refactor 2022 #9