changed singleton