Last changes before delivering
Last changes before delivering #2