better atom support