Post Demo Workings fixed