More connected componenet code