Demo feature added .. please review