some refactoring and deprecated methods only wrap the new ones