made some additional changes