Updated to break up messages