refactor 10.5