initial changes to fork