Improving messaging logic...little by little