commit from Eddy