Opening this to merge a modified PR from @JoyelJohny
Opening this to merge a modified PR from @JoyelJohny