reorganizing for data setup functions