-More changes: General working support for ST3