FE Logic update