X2 renew,fixes