incorporating scott's comments