re-work on ch7