sjb updated with message and thread system