Updated with Ben's comments