added whitelisting option