@atom improved and simplified