10:20 AM Shubh monkey: do you think we need more validations on the modal? or should remove the commented code for that?
