connection redraw refactoring #1