Final fix for weighting and not exceeding 8 hours