added some messaging changes from gianpaj