Tidied up group switching