Update for alpha 0.2