Check in the changes to accomodate WebSockets