removed some changes