got all deprecation warnings fixed