Fix: branch now supports ST2 and ST3