Add atmosphere support
merge atmosphere modifications