Commit from last weeks changes