EOD catching changes