Removed old overwrite check