merged saving and fixed it in multiple languages