Changes made prior to demo.