can we consolidate this PR with the other one that dhruv submitted?