Demo updated too