Better with the singleton