work on socket and maps integration