nick - class demo changes