Make elapsed time configurable
Make elapsed time configurable