chp4 finalizing
chp1 edits