Make save smarter