various change for make sure orders are correct