Refactor 1/2