#13 Repositioned connection areas