Edited class to read a different file format