update to switch from destiny to socket_base
update to changes in master