Better order of functions