Updates for demo, final.