Dirty commit - last minute demo changes