rolling back some changes, errors introduced