Lote of changes

(Not run)