submitted
some changes