Updated with revised plan of contents