@ellisonleao What's the purpose behind the conditional change here?