Updated to work with new spreadsheet format