First version with Atmosphere support