Updates for beta 6 and experiments for chapter 9