A bit more restructure to achieve demo
Added further description