Cleaned up DK's latest.