helpers.* modified