Updated for class demo and lab