CompleteV1.0_FixBugs