Changes for custom message