Swithcing to using double_t for the full time map