Added back some changes that got reverted