some changes reverted