large update for alpha version