updating to more correct