Cmmit for Final V1.0