Updated Classes with close Methods