merged w/ marco and eman
added callout socket events