Updating for SS 3.1.6