Refactor 8-18