More changes and like stuff