Added client side sorting