gma: working commit