New version for white space fixes