made switching between Connect Mode and Play Mode faster