Merge Jared's Updates. Take all CREDIT