Large Update

Large array of local changes