Added blocklist update and removed unesessary 'which' lookup