Refactor 2022 #11