Fixing the merge issues from Jai