some more initial changes