some changes
merged and no mroe org