Updated Demo project