Added weight calculations