More changes to be more correct