More commit

This is the last day for any changes before the demo