Removed old code, added new