Added additional changes