bad
some changes