merged live and switched to sockjs