Demo project now is universal