Updated for Fall 2013.

Updated for Fall 2013. Feel free to test it but seems to work with my schedule.