new patterns and fixes