Update on FET before the merge takes place on July 1st