Updated and tested for ST3