adjusting deprecated data handler