updates done, not sure if they are correct