Prepare for alpha6