Cont. of last commit...