renamed lists in calc function