some more beautiful updating