Added logic to check if evm should have a pill.