Changes

Done with ch2 and 3