Some new changes made