Got new patterns working at last