Updated logic in FM