Mock2 additions and corrections