refactored Submission/InternalTip - NT