Updating functions to match Jake's updates