Revert "Revert "Update by Kashif""

This reverts commit 9cb1afb305e10ac3bc799df94a6a35ab9cc63ad4.