added back new STL changes