Modified demo project