Some changes for alpha-6