Small additional changes