Update on refactor