demo and error fix