final changes for alpha version