-Adding Jeff's changes
Communication now correctly setup