Updated mock