Adding sort and updating find