1.1 improve roster rules