some mocking changes