re organized chapters