added chapter2 stuff