some changes

maybe bad