Moved the logic in when over to all.
New logic in When using All