Consolidated into single file.