made further changes to shaadi.py so that it can handle all the cases