This commit handles whitespace better.