Make things more ST3 friendly