Slightly improve role logic