Added ST3 support (does not break ST2).