Changed the way selection works