Demo Class Changes