todyas work
some changes