Using timeuntil instead of computing it manually. I need to test this.