edited the v1.0