Added message detection to be sent