Sort of added Search function