Added Undelegate method where needed and implemented the search design