Merged chapt6 with master