re-compiled version with whitespace fixes