FE :: Some improvements