merge samarth's changes