Removed all depricated methods and replaced them with new mthods