More FM methods added

Do you need to do this again?