commit@22aug_V1.0