stuffs added to [10041315]