several changes : back to xz, test a few optimization, add back OC