Added calculation time and generation