updated helper and defaults