replaced deprecated usages