demo: implimented Shuya suggestions
demo: minor fix