Changed duration units to ms