Updated to work with SS 3.x