initial changes, more work left