New code replacement 2/2 -- Added new old code