Tweaks to pin mechanism.