Tdh merged 2

thank you for renaming the single-letter vars