final changes before class demo