Make the entire system more robust and able to process elimination data