Small logic rework
Small logic rework

SalesforceFoundation/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus