Rolled back some changes