Data is now saved correctly!!!