Updated with search