updated for new file format