Changing to order.payment? since order.payment was removed