Jared's functionality changes

Testing Jared's changes