SAI, idler
Fixed merge