completed MemberWatcher
some fix