Refactors and now listening to not-tags and reg-names