changing message handling