first select incomplete, added
removed unnecessary code