refactoring, fixed connectors