more work on mocker