improved MCLibrary