converted some deprecated methods