some initial changes ...