Proper updating