dependecies fix and added FM feature