revised data setup