Upgraded alpha version