Updates suggested by Ranveer