changing up safe-add