some adjustments on patterns