updating to remove deprecation warnings