Updated Tyler 2.0