Better compatibility with ST2