re-enable data selection code