Improved walltime logic.