Updated for more pattr use