More changes for zaidel