last changes from the old repo