Removed old code that overwrote d