some changes, more comming soon