updated for additional libraries.