more order of functions change