Initial app version
More robust method