Back to pre, adding overwrite support