added update and remove from world cases