doneP1
added changes