change order methods to order_by