Demo improvements