added default values
added ch7 stuff