More improvement on the singleton