some changes that MBK and I went over