Update manager (6/24)

Update manager