CONN-1161

Resolved issues found during QA of CONN-1161
can you just call the other script instead of repeating code?