Removed old code and adding new