Updated calculator runtimes