Issue #6: got rid of some deprecated methods