Do the singleton as well