stuff for [9530611]
stuffs added to [10041315]