master: a-0 ch2 commit