adjust code for new data feed