last changes before class demo