Added TimeScaleFunction to demand
Added one FIXME