finished changes for amg