enhancedFM

Applying some changes