Start of porting to Fay.