Now loads from data file correctly