Improve time limit managment