After demo - with small opt changes