Additional change for FMM