new patterns, minor changes