last changes before david's feedback