fixed overwrite concerns