last commit from norheim