Incorporated feedback from @siddharthab