Rework Joint IDs to go from 0 to N