improve body part handling