Simplified previous changes.