added a couple helper classes