Remember blacklist and some design changes

we can do better!