changed extremities handling