generate_proper_resolution refactoring