Add changes from testing
Clarify the not-yet nominated logic
Fix the logic here too