Refactor 11.1