Saving changes and fixed all deprecation warning for 1.9