#2 fix for deprecated methods