swapped out deprecated methods