updates to in-class demo code