New code replacement 1/2 -- Removed old code