half done w/ updates