post-dojo - refactored to own class