Fixed running overtime. Still some slight behavoir differences with the old CSA