Fix & exapnd demo