Moved fm notify to relevant subfunctions