add handling for 7 and Early Access