Modified 1.1, 1.3, 1.4, 1.6 after reading the book