improved atom order