Added more comm code