Reordered noun-adjective
Merging Daryl's code
Modify structure slightly