Refactor 2022 #8