Whitelist and pin protection functional now