updated from jared