* some changes