Refactor 2022 #6