adding more fmap code