some updates for new data protocol