Fixed NDVI issue and leading towards including cfs