Updated to use your pattern.