added whitelisting