Updated

Few other changes done