Added singleton again
Added singleton