Updated to update correctly