1.1 2nd commit

finishid