Checkpoint before introducing averaging
Typing patched up or suppressed