Adjust singleton