Make demo standalone