Tool Modifications

Isolated functions only called when option is selected.