Added weight and length calculations