Improves singleton