Cfy 1295 improvements