More champselect work