Refactor & Decrease wait to time search