address ben's testing feedback