Finish ver1.0