fixing stuff up for Jared