Updated more pattr stuff