Added currentTool variable