chp5 

ready for merge.