Ported changes for alpha 3