More ST3 changes