Updated watoki demo draft