updated for fall 2014 semester