Updated to V3.0.0