refactor 12.05