Merged medhini's code of adding /medhini