Improved mock