updated deprecated order method
fixed merge conflict
fixed order stuff