Final changes for alpha 6