Upgraded tested version