Refactor to use not_to change