updated v1.0