simlify message handling
simplify things futher