Improved Mock