Incorporated STL's comments