Refactored tools
Resolved Merge Conflicts