watch out for whitespace/tabs damages. The github diff output looks like the new code doesn't use the same standard as the old code.