class demo edit, no major changes