Follow the atmos example more carefully