Here’s a new patch with the changes you’ve asked for. Let me know if you need anything else!

Saagar Jha