demo - fixes