MCDemo enhanced