Repair higher-term stepdown and… — Code review | OneNoughtOne