Upgraded to Atmosphere 2.2.x