more work on Mock