Hacking on the atom selection code