Updateing Search to current trunk