PUBSTWO-911

Take a look to see that I am following the right patterns.