#16 Repositioned connection areas