a bit more faster on save