Make pattern a little better