added some initial changes