just updating. not finished