Use __pattern__ instead of re-write