More changes for dhaitz