Adding back changes to refactor