Added more stuff to ch6