more singleton updates