Last changes after handing in