last changes, adjustments