some correction for the demo, try out