moving library calls around