Some edits for ST3