Last changes on delivery #3