Work to make the same branch compatible with both ST2 and ST3