evening commit
codechat uses new connect
merge conflict resolved