MODIFIED: cleared all white space and merge with updated version.