Fixed error + set up for additional conditions.

Sorry, I missed one in the producer swap thing.
+ Set up for additional conditions.