TEMP: Close to optimality
TEMP: More hopeless changes
TEMP: Update ref results
TEMP: Check for races afterwards