More of last commit (wasn't fully commited).