Preparing for next update

More changes might come.