new helpers module with bug fixes