Updated logging in FM
Updated again