With comments in record. Next modify for easier cleanup.