re-ordered library calls