first pass at changes