commit from dinufoa