Make chat work
merged fixed