removing reliance on deprecated methods
removing reliance on deprecated methods