Refactor 2022 #5