After testing in the simulator, this looks better