Added length calculations