massive changes:chap_07
merges all changes - chap07