change two library for version3.0