slightly improve time scheme