attempting to fix the not-working patch method by separating out patches, first of several if this works.