Add expect in EOD