Reverting back some changes for Tejas's code