Checked and updated demos