made initial changes to mock