adding Ben's changes