Removed old code
Added new code