Work on using more patterns