Demo final changes