Upgraded sample application