Updated a few things to non-depreciated methods