went with verbose if statements for readability and removed else
Merge branch 'hotfix/fix-woo'