working on fixing chat