start chap 5 cleanup
solved merge ;-)