demo and scratch updates