re-arranging to add the tools