Initial commit was incomplete. This completes all changes.