Working on switching to the AMD methods