Need to update this to use the helper