started implementing white list feature