#1 NextTalk removed
#1 minor refactor