Address issue #8 and rearrange the structure of Sec 8