Better performant, ST3 only version