update singleton clarity