updating all this junk