last commit from griffins