added changes for ProjectA 1.0