Subscript feature with some monor edits