Implemented proper swapping between resolutions