Update for class demo in 2014