Updated to work with ST3