Big demo additions