Updates from GGAM

/Updates from GGAM