More changes after looking into integrating back into GMI.