some changes
removed