This is exact logic i am using for untrusted list. Perhaps at later stage we can combine both.