Correct requirements, fix bug with elapsed time