Update Equipment pickup and fix calculate data