Now with ST3 compat