#15 Repositioned connection areas