Most modified code backed out to addition and overlays