some additional changes done