update to code

all done except saving