fv: change logic