Some adoptions to E3/E4