Moved search to the end to defer it more