finished amg and spg changes