Final Changes for both

Final Changes for both