Updating to be more accurate