Fill in some placeholders.  improve FM