More changes for smoother operation