More work done to live chat