Updating files from fall 2012