updated to ver1.0