Fix time error. Now uses the 'remain' span, no the m-s span