Reordered some stuff
connect/disconnect notification