v3.0.1 Final Edit