Updating to make more sense