Added timus-friendly solution.