Revising the library calls