Removed the selection code to make room for a cleaner version