Reworked current tool forms.