Some initial changes to get going