Added white/black list -- testing now...