updated with lib changes