Ver 1, with two types of data files