Adding changes for EOD 27 February