FCM working updated