Updated for curriculum, domain name plan changes