Updated to v1.0