Subscript Handler revised