Working updates..  Does not work completely yet.