Minor changes to be done