More migration to ff2