Refactor 11.17