reorganized deprecated methods