FM more function fix
Merging