last changes before DB presentation