Removed some added code Made searching more effecient