Design and Implementation chapter re-design