2nd draft

made some more changes