Final changes before demo