changed 18 and 67 to reflect updated helper.