New update

More changes in the code.