function ordering
Merge branch 'master' into diversity