changes for chapter2

reviwed by Jason/Riq over lunch