More changes by patrick.