WIP: support ST2 as well as ST3