migrated fr to new design