Next batch

More changes made