Some additional changes