Demo project improvement