CFY-516 lots of modifications