Final - corrected problems with local_new not updating correctly