Pre-submit version with small corrections.