Initial changes matching earlier local modifications