Improved example app