minor changes left for the demo