Refactor 8-27