Upgraded version of cfy to 3.1rc2