Small changes to before save. Wasn't being called properly. Old commit.