Reworked for new spreadsheets