Cleaned up PatchModel