changing up Connect class and it's use in the tool.