updated core and websocket to new fucntions