added other changes