Ported over a couple more patterns