AMS Buffalo, revised