Little improvement of embedded
Fix problem with disconnect and connect