#18 Reverting back some code removed by mistake from dummy app