latest updates - still in progress - not working yet