changes done. Need to fix the issues seen in tests