Better handling of remaining time