Refactor 04/25