second half of last commit