Adding comment line to DEMO to control some configurations