Added simpler, non module pattern code