Feature/book 960

Should these be commented?