updated deprecated order method
fixed merge conflict