improved ST2 compatibility