More changes applied