Altered things to no longer call deprecated methods.