Goals now returned as integral from machine layer.