Made changes related to communicating with Q