some changes
sorted