fixed with changes