Updated to take advantage of the godsend whitespace changes.