updated for version 0.1_alpha_2