Added connect as master and connect at buttons