Improve ATOMIC-POP in a few ways