removed reference to singleton