added components from original syllabus