fixed all deprecation warnings