[FP] Some changes