Added initial cut of white and black lists