enhancemets to custom chat