Quick changes before last demostration.