Added back some changes