Improve time trial mode