As per changes EOD