updated version for Fall 2014