same changes here to reflect previous comments