Correction based on feedback from Erik and Tony