adding the full @cwilso monkey patch