Updated calculator and generator