Adding changes from instantChat + more!