WIP fixing intervals formatting